Auto merge of #3274 - alexcrichton:more-travis-again, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 8 Nov 2016 16:30:24 +0000 (08:30 -0800)
committerGitHub <noreply@github.com>
Tue, 8 Nov 2016 16:30:24 +0000 (08:30 -0800)
commit5b5684ebfdba63dba4738858472dda5080327056
tree99e0dfe54936ed1879d9574ccf0b0b8b2f8d9b45
parent0c155a47d61b37425e9c28f76fddf7bc2cb7df08
parentdc15ca5d202d6d10f6be45f388759a902723de6c
Auto merge of #3274 - alexcrichton:more-travis-again, r=alexcrichton

More travis again

Landing this again hopefully with the doc fix